Merge
authorTim Deegan <Tim.Deegan@xensource.com>
Thu, 12 Apr 2007 14:55:24 +0000 (15:55 +0100)
committerTim Deegan <Tim.Deegan@xensource.com>
Thu, 12 Apr 2007 14:55:24 +0000 (15:55 +0100)

Trivial merge